From 15c81f52d39865d2780f46a43ff906af539fe4c8 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 4 Dec 2000 12:07:41 +0000 Subject: [PATCH] Return positive descent. 2000-12-04 Alexander Larsson * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics): Return positive descent. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/linux-fb/gdkpango-fb.c | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5affd689da..8cf750dc3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-12-04 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics): + Return positive descent. + 2000-12-02 Havoc Pennington * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5affd689da..8cf750dc3b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2000-12-04 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics): + Return positive descent. + 2000-12-02 Havoc Pennington * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5affd689da..8cf750dc3b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2000-12-04 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics): + Return positive descent. + 2000-12-02 Havoc Pennington * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5affd689da..8cf750dc3b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2000-12-04 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics): + Return positive descent. + 2000-12-02 Havoc Pennington * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5affd689da..8cf750dc3b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2000-12-04 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics): + Return positive descent. + 2000-12-02 Havoc Pennington * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5affd689da..8cf750dc3b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2000-12-04 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics): + Return positive descent. + 2000-12-02 Havoc Pennington * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5affd689da..8cf750dc3b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2000-12-04 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics): + Return positive descent. + 2000-12-02 Havoc Pennington * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c index c0b054f001..75b28f6a73 100644 --- a/gdk/linux-fb/gdkpango-fb.c +++ b/gdk/linux-fb/gdkpango-fb.c @@ -841,7 +841,7 @@ pango_fb_font_get_metrics (PangoFont *font, if (metrics) { metrics->ascent = (ftf->size->metrics.ascender * PANGO_SCALE + 32) >> 6; - metrics->descent = (ftf->size->metrics.descender * PANGO_SCALE + 32) >> 6; + metrics->descent = ((-ftf->size->metrics.descender) * PANGO_SCALE + 32) >> 6; } } -- 2.30.2